From f1a381df9c07d58ff924ab0ee3c7400a370eee1e Mon Sep 17 00:00:00 2001
From: Keir Fraser <keir.fraser@citrix.com>
Date: Sat, 30 Aug 2008 08:36:02 +0100
Subject: [PATCH] cross-install: Only apply in tools directory, and
 automatically wrap $INSTALL. Signed-off-by: Keir Fraser
 <keir.fraser@citrix.com>

---
 config/StdGNU.mk    | 2 +-
 stubdom/Makefile    | 2 +-
 tools/Rules.mk      | 3 +++
 tools/cross-install | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/config/StdGNU.mk b/config/StdGNU.mk
index a7263dcf40..aaa89a2664 100644
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -16,7 +16,7 @@ MSGMERGE   = msgmerge
 # Allow git to be wrappered in the environment
 GIT        ?= git
 
-INSTALL      = $(XEN_ROOT)/tools/cross-install
+INSTALL      = install
 INSTALL_DIR  = $(INSTALL) -d -m0755 -p
 INSTALL_DATA = $(INSTALL) -m0644 -p
 INSTALL_PROG = $(INSTALL) -m0755 -p
diff --git a/stubdom/Makefile b/stubdom/Makefile
index 15de9eb536..b94c4422a8 100644
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = $(CURDIR)/..
+XEN_ROOT = ..
 MINI_OS = $(XEN_ROOT)/extras/mini-os
 
 export XEN_OS=MiniOS
diff --git a/tools/Rules.mk b/tools/Rules.mk
index 29639a341d..a477c8253b 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -5,6 +5,9 @@ all:
 
 include $(XEN_ROOT)/Config.mk
 
+export _INSTALL := $(INSTALL)
+INSTALL = $(XEN_ROOT)/tools/cross-install
+
 XEN_INCLUDE        = $(XEN_ROOT)/tools/include
 XEN_XC             = $(XEN_ROOT)/tools/python/xen/lowlevel/xc
 XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
diff --git a/tools/cross-install b/tools/cross-install
index 2b67bb34cf..1177335aa5 100755
--- a/tools/cross-install
+++ b/tools/cross-install
@@ -5,4 +5,4 @@ if [ -n "$CROSS_BIN_PATH" ]; then
     PATH="$CROSS_BIN_PATH:$PATH"
 fi
 
-exec install "$@"
+exec $_INSTALL "$@"
-- 
2.30.2